From: Catrope <roan.kattouw@gmail.com>
Date: Tue, 17 Jul 2012 23:20:15 +0000 (+0000)
Subject: Merge "merge msg script now detects extensions main files"
X-Git-Tag: 1.31.0-rc.0~23021
X-Git-Url: http://git.cyclocoop.org/%7D%7Cconcat%7B?a=commitdiff_plain;h=50d7729bea870759e3ff9dfc414ea6b22d99d23b;p=lhc%2Fweb%2Fwiklou.git

Merge "merge msg script now detects extensions main files"
---

50d7729bea870759e3ff9dfc414ea6b22d99d23b